MAX! Fixed second NPE