Now works with php 5.4 again