Working on a bug for rate edit