Fix Quest 10270, 10271

Signed-off-by: Salja <salja8840@gmail.com>