Fix the 'under' implementation