Fixed double function after rebase