fix for previous pull request