Revert last commit; passing by reference like that causes deprecation PHP notices...