Compability Fix** V1.2