fix inconsitencies