sorry
possible bugs fixed