Fixed bug #32