Possible fix (temp-fix?) to #29