Fixes #1373