Improved handling of transformed variables

Untransformed variables cannot predict their transformed equivalent