Partial fix for #85