Tested up to 3.5.1