Fix for correct block