Fixed bug #47