Subsample bugfix