fixed for new samples UI