fixes #123 previous commit fixes #124