Cleaner fix for insufficient data