Issues fix

Issues fix