Made changes to try to fix the spinner double skip bug