partial fix for #262