still fixing NPE...