Array vs Hash bugfix