Solves #10636