Override block bug fix