fixed incompatibility issues