ERT-630 fix for OS X