Fix auto-cycling behavior