Replacing null by undefined for consistency