Fix issues w/ V1 stop lock