Fix loading from xar file