correct fix for #5653