check in the long waiting fix for the single mode
remove the constant duplication