fixing as per comments