Fix for Travis-CI build