#1515| Fixing mappings for sample