Fixes #1376