Fixed: move PHP 5.3.3 workaround to the right place