Code update for php 5.5.15