Update #721 - Update to correctly handle arrays