Fixes #655