Fixed bug #59