Latest changes fixed