Fixed bug #71