Fixes #1526