Derp fixing (as usual, in Java)