Fixed bug #18