fixed current id issue