fixing cascading model and context