Last minute fix