Fixes #1368