Fixed Compatibility for 1.6 java