Another fix
Use core context except for legacy