other changes for bug correction