fixed spinner issue