Fix: form was broken if add row in between