fix: apply with correct context