Fixing issue on OS X. Need to determine how this affects Windows.