Fixes #1527