fix mapping issues on samples