Fixed spinner #28