Some bugs was fixed