Fixes #1539