Fixes #1425