Spinner change for better reliability.