Fixes #1523