patch against 0.18.10