Dirty solution to get throught the package process