fix for issue 812 - cosmetic simplification