Final fix after submission