fix as per comments