Fix hoshi bug