Return block on passthrough

Please review PR.