Try to fix the bug #18