new portion of fix ))