bug fixing 02 (not finished)