Fixes #523