Fixing broken block passing for Opa