Fixes #1772