Make fix as suggest