Fix the problem whose cause is the same as that written in commit log: e6d1b55e.