Fixes travis test 

This PR has two commits, together they will fix the current failing travis test.