Fixes #148