Fix after comments on PR