fix the spinner issue