fixed sample handling in toolbar FS#2691