Fixes #4416