Fixed bug #37