spinner-fix
Quality of life