work on #234
fixes #417