FIX: bug induced because of variable copy removal