Removed is_array check