Fix for ROI support