Package defs fixed