140707 Mac compatibility