Fixe for travis-ci issues