Try to fix NPE