Some other bug fixed