fix rtn and scanner