Fix for packaging bug