Bug fixed. And issue #6428 closed