partial fix for #55