Class Ordering Bug Fix