Fixed bug with non-variable cluster size