Fixes #161