loader: fixed reverting arguments too early and not appying them