first shot at fixing #12147