fixed errors in initial situation