bug fixing2