Fixes #345