bug fixing done