partial fix for #64