In lue of release 1.8