Fixed faky issue