Added compatibility line. Need to test more!