Fixed bug #1850