Fixed for updated KrisLibrary