Fixes #4072