partial fix for #204