Last-minute fix