Loading state fixed