Added: Fixed jre7 compatibility issue