really fix the NPE this time