Merge "Fix double-add of calls"