fix comments locations