Fixing Whit's commit