fixed earlier fixes