changes for fixing bug