changes for bug fixes