Fixing one of the bugs