Change the way to avoid the warning 4505