Code fix after inspection

Code fix after inspection
Code fix after inspection

Code fix after inspection