fixed and correct