Fix uvigo workaround