fix for MAC
style fix
Merge branch 'osx_fix' into next