Emergency change to fix incompatibilities