Fixed bug #44