remove suffix ... needs fixing