Fixes #156