Fixed inconsitenciessadssadsafsafassaddsa