Fix for packaging insanity