Fixed small bug 2