Simple fix for #4661 if #4665 cant be merged due to lack of testing