bug fixes for 0.5.0