fix for context
fix edit issue