Bug fixed situation edition