Update to 0.18.7