fix refactor by Tocha idea but Tocha bad write -a