Use correct block effective with 3.1.2