Real last UC2 fix