- solves issue #22 for good this time :)