Fixed mysterious NPE