Fixing multi-cycle shortcycling