Hack fix for 'Array' issue