Fixes - sampling logic