fixing Issues