Fixed one of the bugs