Fixed bug #39