This implements the same change that was made for E31x. The same issue wasn't reproduced on N3xx, however this change keeps the code consistent and eliminates the potential for the same problem. Original-commit: e94a209c5b2559348593a6732d694fd49ab59ad0