fix for #18