bug fixed yeah