Fixes #185