fix one bug :-) still one remain