Fix bugs (It works!)