last change for 0.9.18