Merge in dist fix from Monty