Updated compatibility (1.9)