Added a better fix for ff3ccbe