changed v18.1