Allow compatibility for 1.9