Fix for Travis tests