Fix for distribution purposes