PM-527 : fixed undefinded-index issue