Fixes #1480