Fixes #2206