Fixed 1 class bug