Fixes #91 and #92