Main fixed again