Closes #20, fixing Fatal error in J2.5