Fixes #1476