Fix for golive