Fixes #1451