Better fix for the too few notes issue.