Fix 1355256 issue