Fixed value

Fixed value and add comments