FIX problem with reshaping after subsampling