Fixes #1453