partial fix for #4