fix some hax