Again restore compatibility with php < 5.5