HEX-1336 & array index bug in NN eval