bug fixing 01 (not finished)