Fix for dist build