Tested up to 3.6.1