bugs was fixed