closes issue #170, thanks to osvenskan