Fix points NPE