NAWQAAN-44

Forgot to make this pull request.