Addressed small bug