Fix in yaybu core insetad