I think a more correct way of tz fix