Fix #13351

Fix by Malcrom