started a fix (not finished)