Fixes #1432