Fixes #4123