this fixes #205
code review