Use 2.4 compatible syntax, Fix #619