Fixes #6810 in support