Fixed bug #2307