Quick fix to upstream