Pair Programming Fix