fixes context for cbv