fixes #1 from master branch