ported fix to RT 5346