VERSION5.1.113 - Fix inner classes issue #147