quick fix NPE