Fixes #157, #158