Fixed Jeff's code

Fixed Jeff's code