Fixes #1367