fixes 86
fixes #186
Fixes #185