improve off note handling