Fixed issue with general note support.