2.8.6 -> 2.8.7
Fixed PHP 5.4+ only code