Fix for Travis Tests