fix NPE for real this time