Trying to fix Goutham's bug