Correct fix for #4438