Fixed converting arrays and objects