Bug 124: Mac issue fixed