Fixes #1430