Accpetable fix for long standing Freewheel mode bug.