COMP: Dragged into ITKV4 compliance