Fixed Class statements