Replace ArrayList with Array, fix issue #86