Fixed bug 2