fix first part