Fix RB edit field issue