Fixed bug #52