fixed for small data sets
migration hacks