Revert "Fixes#4"

This reverts commit 836e84a8f26e540eecc9ddeb2853b2c795c04de1.