Fix reported issue as part of 3bbc84a