Upgrade to php 5.4