[#358] refines scenario