Some changes to achieve consistency