TOA: bugfix in the previous pull request