Fixed bug #42