Fix for live version