Fixed bug #40.