Temp fix for cglib2.2 vs 3.1 problem