[3016] Improve quest 12733

Close #108