Fixes DevBoost/JaMoPP#16 according to issue description