Hopefully fixed issue #17