Correctly handles spinners