Fixing cycling bugs