Revert "Really Fix issue #2 (For me)"

This reverts commit 864a30e8432146853854655ad7ab243160fbc722.
Revert "Revert "Really Fix issue #2 (For me)""

This reverts commit ced9c62c17b49d6ea99aac3bff05bfc421b25360.