Fixed bug #41