fix small bug as well