This seems to fix when toggling editing