fixed up package handler