Fixed bug #6347