//Minor fixe for 1.8