patch against rev-228