Fixes #4060