fixes Issue#172