Fixed minor bug 2