Merged in Pauls fix