Normal case fixed
Some fixes