First attempt to fix NPE