Issues fix 4