Fixed pass issue