Issue #36 -- clearer, better fix