Correct fix for #4060