Revert "Fix #1"

This reverts commit 600e96884c8542ec65fe2766cd23cb2974d8dadb.
Revert "Revert "Fix #1""

This reverts commit 5070fd9943304c2d23a82a982561223f5d523345.