maybe fixing the NPE