Fixed bug #2294