Revert "Remove useless fix"

This reverts commit fd04d71c40dfed8d3a5c0d70b153d18f22b921b8.