Fixing second sample bug