Fixed bug(not tested)