XSAF Bug fix with default config