Replaced stupid fix by create_function() based approach.