FIXED: weird new NPE