#89 minor optimization