Partial fix for #87