Fixing loading classes
Merged