Proper accounting of number of modes