PANDORA: fix to the nosouldermb switch