Finally fixed bug #18