Fixes #1528