complete the fix for #18