Fixed weird NPE