Fixed missing endblocks