Fix context not getting passed correctly