Fixing the bugs again