Fix for staging