Fixes #1475