fix a bypass issue