fix the wrapping with keywords