Fixes #1467