Fixes #1444