Fix for packaging