Fix for #4681

#nerftele2014
Merge pull request #4704 from Jarcolr/patch-1

Fix for #4681