Fix for editing fields