fix for darwin ut
Merge