Fix for Arrays