#687 - minor simplification