Fixed issue with single indexes specified as arrays