Fixes #611