fixes #181
WIP