Package bug fix