Spinners performance fix