Fixed possible bug after implementing -class on the subclass.