Fix to make related calls consistent