Fixes #162