Mac related fix