Fix bugs, seems everything is ok!)