Bug fix partial sample