Correct bug in contol unit retrap logic