Partial fix for #64