Add check to ensure correct patient is returned