Fixing live version