Make origin play nice