Stay 1.8 compatible