Fixed ID issue for release mode as well.