Fixes #1575