Fixed more of the issue with the rotating and unknown classes