Add macosx fix from #1407