Fix for class instantiation for pre 5.4