hopefully fixed issue #5