Fix for mac/linux