Fix block passing