Got rid of 16-dimensional limit