+added some fix