Function reference fix