Fix end block