fix spinner handling