Enhance the fix implemented in 41882a99