Tried to fix NPE