FIX: PHP5.4 Bug
TASK: Merge