fixed 	#21371 : added the block.super where they are needed.