Last moment fix