Maybe this will fix the edit issue