Really fix the package path issue