some fixes with render
fix for context