Fix for empty array data sneaking through