Hopefully fixed issue #57.