Add a better way of working around array issue