Fixes #1506