Both forms are now considered acceptable