Code fix after inspection