Horrible mistake fixed
Horrible mistake fixed
More fixes