fixing the way we pass single-pass flag