Fix for #4681

#nerftele2014