fixing bugs from interpolate merge