Resolved #9

A more thorough implementation would check the java version of the code
and make a different fix for 1.5