Standardization fix