Fixes for when first element of array is ementy for extract