Fixes #4135