Fixed incompatibility issues!!!!