Fixes #1435