fix handling of *X blocks