Remove -XSafe for Issue #20