Fixes #1369