BS-7531
Fix code issue.