* Fix issue with array