Fixes #1428