Fixes #1555