partial fix for #195