partial fix for #2