Fixed bug 1