Final UCI fix