additional fix for server bug on mac