Huajie's fix