Potential fix to instrument selection mapper