Fixed bug #496334