fixes #12434