One additional fix for OS-X