Try to fix cakephp/cakephp#3758