Fixing java 7 update 21 bug