-Fix for Context being NULL