Bug fix - loading spinner duplication