hotfix for context on new model
WIP