Fixes #1434