commit by jayli,bugfix for prepub env