Tested in 4.0