fixed bug #18