compatibility with mastre branch (php)
bug fix