Duplicated note fix for 3.0.1