Fix spinner issue