Actually do it correctly. Should be more forge friendly now.