fix map and form