Proper fix for r50248 ;-)