Fix unit change at loading