Fixed bug #51