Fix issue #57 (replace [] with null)