UPF update: Fix for weird warning