Fixed package handling.