Fixed bug at line #55, and fixed bug and line #48