bug fixes for 1.1.18