Fixed classes using classes instead of id's