bug fixed
bug : taking too long