Fixes #1370