fixed JDK 1.8 creeping in