fix. part 2