For NPE, fix #1403
Use xxf:instance, fix #1404