change base format
bug fixing