Fixed bug 3