Workaround for travis issue #2326