bug fixing 1