Fixed bug #49