Java standard compliance change