Fixed #5943: Fix issue of last commit