Fix spinner hang