Fix #580 Replace numbers in Array with enum