Revert "Fix #19"

This reverts commit 7e7c05b58a6431e90fddc2217bdcf67210a56c6d.
Revert "Revert "Fix #19""

This reverts commit fd182aa9d7040a183b2959898447a5f84e7d1177.