Fixes #1383