Fixed bug #5845