Non-lint bug fix