Fix for struct with select dynamic and embedded controls.