Fixed eventual Array error