Added fix comments