partial fix for #238