Applies correct fix to #6294