Fix #2225

Just travis this up here for travis to run, single a couple of tests fail locally for me