Fixes #1378