Arrays fix