Fixed copy and paste bug and add change as requested from review.