fixing contextTenat created only first time