Fixes #1409