Getting rid of small bug