fix unshifted master bug