Fixed bug #34