Try to fix php 5.4 compatibility, again