Fixed bug #36