Fixes #1474