Dev7g

Results 2 issues of Dev7g