fix mistakes of the previous conversion