pending fix for #1