bugs fixes for Jap trad