issue_406

Let's see if I get it right, please check this PR. Thanks.