Fixed bug #171