Fix for ycb not replacing empty values