Fixed temporary changes