bug fixes for bug fixes