Fixed bug #55