AutoPass issue fix