Fix for prevent tool reported defects.