bug fixes for update 0.9.0