finally ready for 0.9.18