Fixed remove_spin bug