#177 bugfix