fixed earlier modification