fixed None's bugs;
fixed None's bugs;