Fixes #567