Bug is fixed #2
Jul 21 modified