change for version 3.6.0