partial fix for #111