Fixed bug #16.