using the very latest to fix NPE