(issue #3904) emergency fix if needed