Fixes #1399