fix bug #130
fix many bug