Bug fix with php 5.3 compatibility