Fixed bug #18.