more on #51
#51, but cannot test bc this machine has 32 bit java, will shuffle things around and try to test