Fix NPE FC