Java Fix via Nick