Trying to fix travis issue
Merging the fix from Krace