fix NPE again