improved spin prevention