Ticket #104 hack to fix CLI issues on OS X