Fixes #2270