this fixes #122 and #123