Attempt to fix NPE