Hopefully fixed issue #187.