Quick fix for staging