Fixed bug 1 of 1000