Fixes #341