Fixed bug #2206