solve all bugs
solve all bug for yff(WTF!)