Fixed bug #40