fix. part 1