Fixes #1491