fix bug #18