Fixed bug #8.