LUN-579 : Minor code improvement