to many bug fixed