Fix for NoClassDefFoundError on 1.5.2