add part 2 of fix