Override Block bug fix