Changes to correct warning