Fixed spinner behaviour