Fix bugs on recorder