Update with kibit suggested code fix