Fixes #347