Fixed match for basis set model

Improved handling of transformed variables