fixed sample21