Did bug fixing