Fixed Invalid Context Errors
Fixed Invalid Context Errors