fix after comments