* bug fixing