Fixes #1

Yes, it's already fixed, but this helps with #2 also and builds on 5c1d245ab1376ab8e7d65c52630055bed3c0fddb

**cool** beans :smiling_imp: