rlratcliffe Fix #873 (#875)