A temporary fix of the strange error - DO NOT MERGE.