#17 Fix for simple class statements