CS fix for #5245

The fixes done during #5245 merge had to be, well... fixed! :p