Fixes #558