fixing the shit joi made